Revert "Add a temporary patch (revert an upstream commit) to build with the old JGood...