Backout f75bd697d570 (bug 961954) for rc failures