Revert "Worklist #20074"
Merge pull request #3707 from highfidelity/revert-3669-20074

Revert "Worklist #20074"