We need our own patch helper here. Since we have one already, it kind of makes sense to use it in other places as well instead of creating a whole pile of different patchers all with their own cleanup that happens in different places.