remove GH-488 patches from 1.8.7 prior to p370, update #2540