Try to patch this thing to build with 4.8.3