Revert "Merge commit 'a18ad5743d791ab8bc6b054210dc223ffdbd1903' into release-144"

This reverts commit 0a8821100f6618a46b702f5c7c918bc8dff2b98b, reversing
changes made to f8884cf4081980bf9f57f1c7137273b2ed142252.