Revert "Disable patching - but keep code for now (#720)" (#721)

Revert "Disable patching - but keep code for now (#720)" (#721) #1486