Fixed javadoc after incorrect merge.