This reverts commit 99f5b649.

Reason for revert: 2023.2 has been branched and released

Change-Id: I38fc5dcadda5103d63a11022825e8e167408677d