Revert e410e42..9821659

This rolls back to commit e410e420d5073a08be4ee8318c8c0fdbe386060c.
Revert 4975dae..a998066

This rolls back to commit 4975daee3e37030d1c9b9cfb7a6ad6f0bc47fd9d.