[DRAFT] Remove or confine patching

[jnturton]

DRILL-XXXX: PR Title

(Please replace PR Title with actual PR Title)

Description

(Please describe the change. If more than one ticket is fixed, include a reference to those tickets.)

Documentation

(Please describe user-visible changes similar to what should appear in the Drill documentation.)

Testing

(Please describe how this PR has been tested.)