Revert part of Gavin's changes to javadoc