Revert c57239f..589bfec

This rolls back to commit c57239f51f964a2d7814978aa9b5c49504a08a66.
Revert f86419a..0ece0dc

This rolls back to commit f86419aef0c080953fd9ce953b2154f0e64d0fb8.