Revert "1.6 Backport"

This reverts commit fa6430d00a79b6ef46e872e4ad37717d0d8e4e5f.