Revert Javadoc changes since they're in their own PR now.