So I guess that PR would need to convert to that system (or potentially remove the remote_source access entirely)