Backed out changesets a4f1cec360dd and 74a99b693466 (bug 822820) for robocop-1 failures.