Revert masked variable sorting
What does this MR do?
These reverts commit 879ea56a, reversing changes made to 52d57ff5.
Reverting commit, introducing the bug #27861 (closed) but "fixes" a more serious bug in #28001 (closed). This isn't really a fix but hide the real issue much better so it effects less of our customers.
What's the best way to test this MR?
Rerunning this job https://gitlab.com/steveazz/ustream-ssl/-/jobs/1369930079 which should pass with this fix.
What are the relevant issue numbers?
Edited by Steve Xuereb