Revert some Javadoc changes