Re-javadoc'd after move.