Backout changeset a13dafd65d1c (bug 895940) for breaking PGO builds on a CLOSED TREE