This reverts commit 07acc579db. On closer examination of this code, the conditional that had force in it was not a parent of this one. So handling of force is needed i both branches. See the recent comments on #23391
07acc579db