Switched back versions due to problems with javadoc generation.