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