An unrelated change like this (especially to a core public function) shouldn't be included in the same commit as another change.