Backed out changeset 92503c3d379b (bug 1094566) for breaking pgo builds