Restore this change but with a clean of the generated dirs first so that we avoid trying to apply a patch on top of an already patched src. This reverts commit 0f384158fc3aec9672f4aae4c18fa4d47965567e.
Restore this change but with a clean of the generated dirs first so that we avoid trying to apply a patch on top of an already patched src. This reverts commit 0f384158fc3aec9672f4aae4c18fa4d47965567e.