Back out 9661a68f0bff (bug 872605) for browser-chrome failures