This changes the behaviour back to it was before the dirlist abstraction, which is the behaviour I prefer.