Miserable attempt to make directories without subdirectories non-expandable
Reversing the miserable attempt of the previous commit