Restore OHAI-489 fix where gce broke ec2