Revert "EC2: configure hvm instances properly."

This reverts commit 63a50b17f64428755a78dd4968a382c7d768b3de.