Temp rolling dependencies back to SF 2.2