Revert "Update to upstream version 2.1"
This reverts commit 982f6ca32710fdc266353b91aaf15a6107aca5b4.
This reverts commit fcf964c0673e70a6be770282bc7c40bd7008028b.
This reverts commit d5b08e3229cf74ac17091ae20e6559b76b444283.
This reverts commit 181e17359c2bf3cd57f4e8617e3b3710b9819f2f.
This reverts commit 400fd08b908780d5baf4cd6d06563f46ad7e1b98.