Backed out changeset b68c721a1462 (bug 863828) for robocop failures.