use the new App::Uni rewrite from @rjbs