re-merge the --rsyncable patch