fix: #3605388 Revert 2.2.x branch back to 2.1.x

Ted Cooperrequested to merge
issue/genpass-3605388:2.2.x-3605388-supersede-defunct-branch into 2.2.x

This reverts commits: 598c5fed b63ff662 86af92ea ddb7953c And cherry-picks: 0bdc68a7

By: elc By: joelpittet

Merge request reports