Backout 2255560d9b6c (bug 912054) for breaking PGO builds on the UX branch (bug 913251)