Revert b5ac5b8..1e6f398

This rolls back to commit b5ac5b82c00dc85f4afe16b5d87a96a0d6e2a0e7.
Revert 1e6f398..ecaa6a0

This rolls back to commit 1e6f39890456157c8d73ac92ed8cf527dd370c3c.
Revert e25e6e0..bce4dff

This rolls back to commit e25e6e012fd531ad8458877f1e76954740787907.