M4: remove old patch from 1.4.17