FUNCTOR-23 reverting changes from PATCH-23 as the %23 was breaking URL's in chrome and not really fixing the javadoc links