Back out 7bfec63e417b (bug 950225) for test failures
CLOSED TREE