Revert r182331, these checks should be based on the target not the host.