Backed out changeset 6c8521d53507 Apparently this still triggers a compiler warning, have to dig further.