[ros-diffs] [cgutman] 48399: [DHCPCSVC]: Revert part of r48215