Backout bug 984980