Revert "[4.8] testing => main patch"

This reverts commit 179523bd5a3636866f4d8d90e1bddd57705bc532.