This reverts commit d236a26c
This was downgrade
There is 1.22 branch now but for oldstable we can settle for 1.21