Yet another take at broken javadoc -- just don't fail on 1.8