This change could probably be a separate commit, but what is the reason for this change?