Floating ip fix

You'll probably want to chery-pick 989a924