Revert 6 commits 4e05c5b20c-c25aac2b27
Some of them were breaking changes, and I want to do those
in a branch instead.