Overriding method close to keep the compatibility
Java6 fix was merged, going w/ upstream instead of matzew fork
remove a TODO as an empty impl is OK
Merge branch 'KC_compatibility'