Fix check command host selection behavior

[SeeRM #8768] Instead of using the saved value for host, the check
command should use whatever the user specifies.
Land #3098, check command host selection fix

[FixRM #8768]