This reverts commit fbe6d23624b0b62cb5754d37ab81007cd4c035ab. this breaks every non-ec2 (non-hvm) system cc @edolstra