Also, that change is fine in this pr, as long as it's a separate commit