Revert recent fixup changes to just addressing debug info.

This reverts 1050973, f7b0580, 1659507.