Revert "Merge branch 'ajwalker/trace-masking-url' into 'master'"
What does this MR do?
Reverts recent URL masking MR.
Why was this MR needed?
An integration test fails strangely, and we won't have time to figure out the reason before feature freeze.
What's the best way to test this MR?
N/A