Revert "Temporary allow merge for custom patch"