Revert ontology until further discussion