When creating PR #9982, I undid a line of PR #9925, that was some cleanups and fixes, so this undoes that damage.