Revert of commits meant for 2.2.0 branch, not 2.1.2 branch