BUG-2315: Remove dependency to OFJava-impl