Fix for the subnet/vlan confusion, this only cropped up in EC2-Classic testing