The problem from c51e71bb occured again with a call to `ssh` in a different place. This should make sure we don't run into this problem again...