[20160722051815] Revert Existing VPC Changes

A problem was found with the existing VPC changes so they are being reverted temporarily in this release.