Backed out changeset dea697e42d70 (bug 913683) for robocop test failures