That change should really be a stand alone commit rather than be mixed in to a larger, only barely related, set of changes.