R1:e293d39b5fe4

Split the difference on remote URIs.

This is slightly trickier than D8082.

Auditors: btrahan