This also reverts commit 24d8695d8ceeb09d6c84bcd6ee4ffe087c9b386b...
We got most of our patches backported by upstream :)