MAP-476: actually make it not eager.