[AAI] Revert commits that are breaking the master branch