Glob retry

This is a retry of pull #5832