Would it make more sense to be doing this in the `remote` method? I know we don't do it anywhere, but `remote` is technically publicly callable, and would break if called without options.