revert to no datastore checking, its failing consistently for some reason