backout recent additions to v2.2.1