Revert "Move AWS infrastructure over to newer instance types"

This reverts commit eaf8d08876702c43f9eab424bf36226715e9265d.