Backout bug 957768 for bustage.