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

This reverts commit e3656bcdfb35bf5b58a66b0a09e29fd69ad55e14.