[Core] revert break in core#8012

williexu merged 2 commits into

Azure:devAzure/azure-cli:devfrom

williexu:revert_core_breakwilliexu/azure-cli:revert_core_breakCopy head branch name to clipboard