cb6ddfc215
This reverts commit 078b0be4dc69ef4a8cdf4eb15caedde1114950c7. The original commit was a work around for a bug in CLI. That bug was fixed in the CLI, as a result this change is no longer needed and is being reverted. PR Close #37074