I would prefer to make this change in a separate future PR. Is it OK?