Revert "Rollback of Issue #2138239 by damiankloip, tim.plunkett, amateescu: Use GlobIterator instead of glob. — breaks testbot." Un-committing the un-commit of the previously committed commit. :P This reverts commit 40e903f8.
