Fix up AWS support...

This is adapted from #2624 with a few patches to make it merge.
How and what should go in this profile?  I don't see a reference in the README.  Most users will get stuck here.