Revert 70ee4e1..dcb0c98

This rolls back to commit 70ee4e122e51549e18fc4cf0a81c407e1cb08a90.