This reverts commit de8fd37d95.
de8fd37d95
Drop all patches, seems to build fine here, and java/tcl are disabled anyway.