Revert "Merge branch 'eventtagbuilder' into 'master'"
This reverts merge request !35330 (merged)
Causes too many unit test failures: ATLASSIM-4697 ATEAM-642
This reverts merge request !35330 (merged)
Causes too many unit test failures: ATLASSIM-4697 ATEAM-642