Revert "[Misc] Fix javadoc"

This reverts commit c6649f5e1fd57500875c0aaf7bd4cb3d827bd465.

No it does not fix the javadoc...
Work around checkstyle bug