Revive Jodd support, backport #1170