Revert "Dynamically set the CIDR for the public network"

This reverts commit 8ff8e47f5827a5ad9d919aeacaf7651034ef66ea.

Change-Id: I490b7350391de1765a5ca5958bbc803a5b729374