Backout bug 920485 for bustage.