Back out 8f2865b76d55 (bug 887641) for test bustage