Revert "2.1 merge"

This reverts commit 67e40e46e1811d27d173ebdee928834340c05592, reversing
changes made to a937eaabb027e56a9bafde29ba1aab973cc03892.
init commit

This reverts commit 09722f5f61c73d24c6b11b62c15ac642b27c39e5.