Remove errant patch that crept in from latest merge