Revert 0940dfd..51702c8

This rolls back to commit 0940dfd2c397212659ada6685e8eed73a83aa84c.
Revert e3af83b..a35ac86

This rolls back to commit e3af83ba7717f066059cd3ae46fd22c05ed8ec62.
Revert 8879524..a089670

This rolls back to commit 8879524220379130c2f888ffa32fd17e5883f5e8.