This change must sit in a separate commit, as it has no relation to the problem being solved by this one