Revert "Start to add the patches needed to (hopefully) build with 4.8.3"

This reverts commit 3a2efb0b008fe759e2aef5804857db70af8051e2.