Revert "Merge branch 'SemantEco-Annotator' into develop"

This reverts commit 8f0b2f9dcad2c7f9ebdaeebb584f738c7ac0b375, reversing
changes made to 68267e83384a9c59a9c45d602213a05cc8c2d11c.