I don't think we need to worry about keeping it as a separate commit. Its a pretty easy thing to remove a couple lines that are side-effect free for the algorithm. I'm ok leaving it in for now as a transitionary thing as you suggest.