FORGE-1466: Reverted eager fetching