Changes since 2.13:

o  Avoid unneccessary directory writes