Revert b38ae23..7130372

This rolls back to commit b38ae23c939158186e5a93847c0459114c81e810.