Back out bug 1096748 (849a71ebcf66) due to test passing on a CLOSED TREE