Revert "FS-21 FS-22 modified javadoc"

This reverts commit 81be048e0d25e65a866bd0a88ac01c01cdaeddf5.