Revert ebe850c..eb58b37

This rolls back to commit ebe850c763a1ec94f2b89e43f12429d91a9b9357.