8f81cc2fd8
The previous commit to the patch removed too much when adjusting to upstream deprecating 3.7
The previous commit to the patch removed too much when adjusting to upstream deprecating 3.7