Revert "Merge remote-tracking branch 'origin/16-11-stable'"

What does this MR do?

Revert "Merge remote-tracking branch 'origin/16-11-stable'"

This reverts commit f37aa4d7, reversing changes made to 5e74f872.

Why was this MR needed?

After v16.11.1 release, releaser merged back 16-11-stable branch to the main breaking it.

What's the best way to test this MR?

Pipeline passes ✅

What are the relevant issue numbers?