Revert floating_ip regeressions