Back out b4913818b95e (bug 878319) for browser-chrome bustage
CLOSED TREE