Revert changes to make molgenis compile, data aoi changes