Change the way we pass the --suffix option to the remote process so