Matt's --copy-devices patch.