Revert "Issue #2138239 by damiankloip, tim.plunkett, amateescu: Use GlobIterator instead of glob."

Bah. Wrong commit message.

This reverts commit 843d7d66141f086e2ab6fb4c291d874582895fe6.
Rollback of Issue #2138239 by damiankloip, tim.plunkett, amateescu: Use GlobIterator instead of glob. — breaks testbot.