Trying to sort out what was lost during the cherry-picking conflicts, re #8912