issue #23168: get rid of the directory entirely