Revert "Update to Azure tools 2.3"

This reverts commit 258ae2d06d477525772bd6e6036b9555cf4dd932.