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