Revert "Merge pull request #14667 from mcav/utf7"

This reverts commit cfa88581f0bdaa3d4b7a3773ae87edc55260a2ab, reversing
changes made to b44a75862ebcb651381eabc9c3a3b203d76d63bf.

This is breaking 6 integration tests
Revert "Revert "Merge pull request #14667 from mcav/utf7""

This reverts commit 7852023abb572c522a07af558e7c19f557cc4866.

That was a wrong revert, it didn't fix the failing tests.