Revert 38085fb..75da571

This rolls back to commit 38085fbe6cb3bce96a0d869b72116c5d946d24ec.
Revert 75da571..5b2f560

This rolls back to commit 75da571b72bff2c92b3696a4c880f63cfd74452d.