Back out 02fad60002a9 (bug 811404) for PGO bustage
CLOSED TREE