since it breaks the compatibility and doesn't actually help - the problem with NoClassDef Unit is apparently elsewhere. Original commit: fc12f37105
fc12f37105