Move the remainder of ex-ulsfo upload traffic back to ulsfo

(and undo the temporary map)

Change-Id: I76d511e48b7c4127ef0f25339125759b2141f0d2