Revert 86fa1fe..f4a9d3f

This rolls back to commit 86fa1feff9cab46aba97d8b6cc53041fd1af1cd8.
Revert 0b18947..2813541

This rolls back to commit 0b189473d668f366819078897d6742e2954fdbf4.