0e390b5429
These weren't exactly 1:1 replacements. Might be related to #7391.
(cherry picked from commit b9e108eb4d)