Reverted solution to Azure Tools 2.0