Revert of commits meant for 2.2.0 branch, not 2.1.2 branch
Merge branch '2.1.2' of github.com:forcedotcom/phoenix into 2.1.2