PR #1135 broke develop. Reverting the PR.

## Description
`develop` is currently broken after merging #1135. This was from `feature/faster-ad-tls-v3`.

## Expected Output
`develop` is ok.

#### Current Version:
v2.18.1
