Revert "Merge branch 'master' of https://github.com/DonDaniello/DevAAC into frontend-devel"

This reverts commit 0ae91311f006f3405c486cf715ba53c679d4718d, reversing
changes made to 4e49b1c274c2c736ee0bab9274c075ea3da52f3b.