And copying the --no-same-owner fix