DHCP and static configuration mixed up

(cherry picked from commit ef0e572967804e8373c31133119488242de0bbb0)