contrib/backport
This reverts #27520 commit 79e8865aae which breaks `--continue` functionality.
79e8865aae