This was done in early 16.7, seems to work fine so finish the
transition, dnsmasq is next...