[DHCPCSVC]: Revert part of r48215