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

This reverts commit 1aac48d2a5ae0de210993f66b80c70f85487da83.