Backed out changeset cff9a2cee111 (bug 1014708) for breaking robocop-1