Revert 7cc05bb..ecdf8af

This rolls back to commit 7cc05bbf34aeb63aecac8622dde9d2e65f40ce20.
Revert ecdf8af..0d1be47

This rolls back to commit ecdf8af990f5c23ffefe07c01334a429626e9b8f.