remove patches made obsolete by bac6e7b124b5518c1c171babe603381b7afa89e5 a