Revert r128045 and r128051, debug info enhancements.