Shifting SF dependencies back to 2.3