Revert 644d411..e80ba9e

This rolls back to commit 644d411a4daddf5e36672ff940233651bd516007.
Revert 531d56e..dc6da40

This rolls back to commit 531d56eaf5f82ba0012e5048d0ae3466f92b0d70.