If the right way to do this is the un-commented way, let's just delete the commented code. It will still be in git.