[PATCH 6/9] Revert "azure-setup: Fixes bug12763"