i think that we want timeouts on nailgun commands as well, so i think that the latter would be preferable.