Use the floating-ip logic from recent upstream