Or, if the team does allow refactoring as part of an unrelated PR, have clean commits that allow me to review what you did in logical steps.

If that’s not how you worked on the change than you either rewrite the history to make it look like you did or you’ll have to start over.