This reverts commit 6ec4e466. TSC approval on 5 Dec 2023 Change-Id: I58c6bb7e6695371ec03a8c4a13596525e3c84c5d