1221f60c94
Unused function. Mostly reverts c25d90f125
c25d90f... was merged as part of PR 11022 but is not required.