Revert b0e52b9..cfe6983

This rolls back to commit b0e52b9efd6143c4c399455cea19a18b5334253b.
Revert 49879d0..4b3bd07

This rolls back to commit 49879d045d5e5b16867f2cebc1aabfbae6f33159.
-