CB-5466: Partial revert; we're not ready yet for FS urls