revert back to old approach and target for next release for DNS change