Git is good at reverting - we should just remove the commented out code entirely.