Revert 330c523..3674e8c

This rolls back to commit 330c523636c5ecb78e80b46400fbffdac373a2bb.
Revert 3674e8c..6a7ebb9

This rolls back to commit 3674e8c661fdf12cf767bdfd6c99b28f20dadb93.