Revert 24fd8a8..61f7e0b

This rolls back to commit 24fd8a8f15bee3eae60d78a0c43f513fd88dd2e2.
Revert "Revert 24fd8a8..61f7e0b"

This reverts commit 0db09e851d8ed34d9ea32e49838d2feead02823f.
Revert 24fd8a8..3e19aed

This rolls back to commit 24fd8a8f15bee3eae60d78a0c43f513fd88dd2e2.