Revert #1818 but avoid double-dwim, fixing relative fileglob