This reverts commit 9518d381. Requested by TSC on 21-10-2025 Change-Id: Ie9ef182ca529a0f5fc3bceb55186d49502fbb557