This should really be in internal package or at least javadoc'ed as private/internal.

That probably goes for all our delegates ? (maybe do the additional global javadoc change in separate patch)