Gittrac #4528:  More progress, but some of the DAG recovery tests are
now failing -- need to fix that.