Re #6924 Make sure we have the right instrument for remote jobs