Prefer this in a different pull request, but it's ok here.