NEXUS-6356: Still pass on rut as primary
NEXUS-6356: Cleanup