2.0.0-2: Retain ability to use any dir.