Revert c887433..7733433

This rolls back to commit c88743340179f37fe15fe890f7ec83dfb84de1b3.