Revert e89524a..fa93b8f

This rolls back to commit e89524a906efc0f05a5a06acc3c3efee3a40245e.
Revert fa93b8f..a61fc42

This rolls back to commit fa93b8f1fb050ff746a9e2e174eb54741db36c57.