Revert "Fix ec2 provisioning"

This reverts commit d089c14a23c69672e7ef1f52dce8caad5f4077e3.
Revert "Revert "Fix ec2 provisioning""

This reverts commit 865d386dc0103a170af31b12a9cb456f5c979528.
Revert "Latest salt"

This reverts commit 3bc8545aa2918fcd4d42b7ff686137bfa93609e9.