This is a hotfix for the 1.0.0 release because otherwise the two demos
sound very, very broken.

Do not merge back into main!