Back out e8e4b3d4bcfa (bug 831489) for browser-chrome failures