Revert "[2.2.2] plug 2.2.2 tag with 4.1.1 branch"

This reverts commit 5f0fc8548a1d85278331ab7fb2159b117d0b2f61.