Back out 9f76571216ff (bug 880650) for test failures
CLOSED TREE