Move remaining traffic back to ulsfo

This reverts the remainder of 92398282
aka Ibd31de85a7615a235227a34df3ab51be2538a91d

Change-Id: Iaeca5386eec11bcb0f481f5ccfac8aacd55995bf