reverted to AWS keys rather than User keys in Amazon model