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

This reverts commit 4dd17311db4206b5aaa4afa5bad8257f01b170a2.