Fix regression in EC2 disk volumeType, removed in merge of GCE branch.