Now really fix eager fielddata loading.

Relates to #5557