Another attempt to fix Build.patch