Back out df17cff05b54 (bug 927196) for test bustage
CLOSED TREE