Backed out changeset a63deedeb4b7 (bug 917896) for robocop failures.