Revive Jodd support, close #1170