Back out 1b98c119cbfb (bug 8203709) for bustage
CLOSED TREE