Revert global NoteTaker patching, patch NoteTaker=false into a few methods instead