Backed out changeset 450473a4733c (bug 1061991) for robocop failures.