Revert 8c7e08a..c2edd89

This rolls back to commit 8c7e08a4e5f7a37d0cbdf50ba16eca40db0730ed.
Revert c2edd89..25c8331

This rolls back to commit c2edd89f64df18e9bc586d805d596da25d7e23f9.