Re-Revert r257105 (Verifier debug info changes)