Java6 fix was merged, going w/ upstream instead of matzew fork