Rolled back AAF

Changes are just there for Github, old gear otherwise