Backed out changeset 6fc8606d27d4 (bug 1043720) for robocop failures