fb42765 broke handling of create_subdirs False