Revert 0118664..eb4b700

This rolls back to commit 0118664b765222ce781d2f8f840dc3246c60baaf.
Revert 9a234c6..31b9432

This rolls back to commit 9a234c66ce1a8ada32c9a75c8ad15cfc6d7e8ab9.