[NTVDM] Revert r69435.