Fix issue #11983, remove all the globs

#11983
@brson Could you please review this?