Backout bug 987759 for bustage.