Revert 9aa815c..c1ad936

This rolls back to commit 9aa815c1ed76a416a0d93d4b9ababff3da5972d8.
Revert 0b2b29b..ab6dd49

This rolls back to commit 0b2b29b7cfba704ec57871f7e2cb2e61c3d9b386.