Revert athenaprivate1!16642
See merge request !21064 (merged)
(cherry picked from commit 258e99b8)
67d65ed1 Revert "Merge branch 'cherry-pick-36c54a3b [formerly 5c0031d5]-21.3' into '21.3'"