Revert 81ed35e..e88288c

This rolls back to commit 81ed35e2aab10a11d8606954d65a72f26a535e42.
Revert 125f35d..1aed85f

This rolls back to commit 125f35d0bdd8b0f2719138295cc6b1b2ae9563c1.
Revert 58aeaf4..540db51

This rolls back to commit 58aeaf474c4548e0e869764dd839029fa0b7d2bc.