Backout changeset 6f52040ede0d (bug 928364) for PGO bustage