Backout f5d6b3af4966 (bug 1103825) for suspected test bustage