DO-5585:Revert Debug Changes