A side-effect of this is that the derivation required a rewrite in order to apply the patch properly.