Revert "Ensure resolvconf is configured before configuring dnsmasq"

This reverts commit 5562042d485a8efbd18378bb1b03aa4ff33f08d2.

Actually, we want dnsmasq configured before we configure resolvconf,
because we then tell resolvconf to use 127.0.0.1 as a dns server.