Revert 609b52d..51e5c0e

This rolls back to commit 609b52d0a6f07d091cb09ab80b663534d3a9c13c.
Revert 3fe20c1..cd31976

This rolls back to commit 3fe20c1636afb09209961944d43e3e9991db1f19.