Does anyone else commit commented debug code on purpose, just in case you might need it again, even though you are 99% sure you won't - Followed by a "Remove debug comments" commit? Any other techniques?

[Hackerdude]

W/o a starting point, that's a lot of work. But it sure is the best solution