Revert "Merge branch 'removeSimCondID' into 'master'"

BEGINRELEASENOTES Thank you for writing the text to appear in the release notes. It will show up exactly as it appears between the two bold lines

Please follow the template: *Subsystem NEW/CHANGE/FIX: explanation

For examples look into release.notes

ENDRELEASENOTES