Revert "Version v3.16.14.4"

This reverts commit d724203354843a6b37fa465bc264289cfc71bafa.
We need a few more fix backports