undo btsync merge #420