Revert "Merge branch 'main-condtags-tests' into 'main'"

This reverts merge request !78773 (merged)

These changes have been implemented in 24.0. Reverting this MR helps us avoid conflicts on the sweep MR