Merge pull request #12652 from deannagarcia/23.x

Automated rollback of commit a2c5ea614cd5330de4b56a9937377f65309a31f8.