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