Fixup for upstream Spring changes
Attempt to restore Javadoc