This reverts commit 1de60c902c, reversing changes made to e3cc337b00. Conflicts: UPGRADE-2.2.md
1de60c902c
e3cc337b00