Back out ae91affad44f (bug 889944) for browser-chrome bustage
CLOSED TREE