Revert b6c972b..e9702b5

This rolls back to commit b6c972b48d95040d2118408244b0eca6a88089cb.