Revert 'set organization=aau'