Backed out changeset 5ec886a84e94 (bug 971743) for robocop failures.