Revert 1ea923d..099f994

This rolls back to commit 1ea923df25e3aa3bc67bfab78fb21ebbd4e7bf74.
Revert 8ebfec8..e32d84d

This rolls back to commit 8ebfec866fb0aeec5bb58dde2393db2e5566b3ba.