This reverts commit 16a61da4.

Reason for revert: 2023.1 has been branched and released

Change-Id: Ief6b68144dd2d161ca6e98888934888cdfee49a4