reverting incomplete prompt change
Merge branch 'master' into dnsserver