Backed out changeset 403743a219a3 (bug 917944) for robocop-2 failures