Revert 4cbd6f9..c5fe991

This rolls back to commit 4cbd6f93676d2aeeef9b6c5ee07347d07fc8ddbc.
Revert c5fe991..48ef5b4

This rolls back to commit c5fe9911520cc3c145076425b97fd5957add8a09.