Log Message:
sync with src:

Salvage the `create parent directories and try again' path which is
removed by the previous commit.