Revert 88a8881..8addd25

This rolls back to commit 88a8881e629525580e6ae8eb5d5cdad0faae8b26.
Revert 0e175e1..32550ba

This rolls back to commit 0e175e12343c8be12a06f3a672ab73d4ae77fe6a.