Revert "Adds encryption to EBS volumes"
Revert "Adds encryption to EBS volumes"

lmars/flynn,lmars/flynn,philiplb/flynn,lmars/flynn,flynn/flynn,flynn/flynn,philiplb/flynn,philiplb/flynn,philiplb/flynn,lmars/flynn,flynn/flynn,lmars/flynn,flynn/flynn,flynn/flynn,philiplb/flynn