contrib/backport
This reverts #27520 commit e925840aa0 which breaks `--continue` functionality.
e925840aa0
All files in subdirectories are templates, do modifications based on your environment first.