Bug 22696: (follow-up) Use new relationship for prefetching