Rolled back AAF

Changes are just there for Github, old gear otherwise
Merge pull request #11 from CER10TY/dev

Rolled back AAF