This reverts commit 577a5a2075. Somehow that PR automerged itself even with failed CI checks. Release Notes: - N/A
577a5a2075