[remotes] tweak support.