contrib/backport
This reverts #27520 commit 79e8865aaed43de81816390ee616263bb2bee67f which breaks `--continue` functionality.
The note is not visible to the blocked user.