reverting ae60c94cc26d760a5841c406a81b1eec40b35969
Merge pull request #1708 from edx/e0d/revert-ami

reverting ae60c94cc26d760a5841c406a81b1eec40b35969