Rework old entity datastore lookups to new rpcs