Revert "Removing AZ from ASGs"

This reverts commit 2a66284b2b848317070497c6d9aeebe23551b3be.