Fix for EC2 network-related behavior

Public IP addresses behave differently when attached to instances running in VPCs.