Back out 2601d36dc1f1 (bug 918716) for bc test failures on a CLOSED TREE