Backout bug 977730 due to bustage [CLOSED TREE]