Backed out changeset 2254b555a0af (bug 833099) because of PGO bustage