I didn't comment on this previously, but since this change is not really optional, we should just remove the commented out/deprecated lines.  Version control will always allow us to see what the old lines were, so keeping a commented version is superfluous and may be confusing down the line.