I feel like this has a big implication everywhere. if you intended to make this change, do it in a separate pull request.