Merge branch 'revert-56fea2c2' into 'main'

Revert 115 bitrateswitching ism

See merge request !186