Backout bug 961861