There is a order issue with normal patches and extra-patches, so switch to sed.