Revert "Merge branch 'develop' into vpc-support"

This reverts commit 66f9bc83b362ad7fdc6fac4260c9a71cc964bb52, reversing
changes made to a432bffbec39f267872f113cb4a8e21be1eb2045.