Don't add compile to patch manually
Revert
Merge remote-tracking branch 'upstream/master'