Issue #8249 by tuj: Retry with explicit share