Continuation of #2515. Per https://github.com/iterative/dvc/pull/2837#issuecomment-559559857, this will still be pending after finishing that ticket.