This should be a separate patch.  Plus I don't think this is necessary.