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