This allows building for arm and intel without having to apply a patch
This will create a new commit in order to revert the existing changes.
