Revert b9fa0ca..370a29f

This rolls back to commit b9fa0cad5e9735a65aac8afb5375ae338e80328b.