Back out revision 58e2271ca9d0 (bug 897811) for browser-chrome test failures.