Revert 3e30a16 which broke stereo upmixing of mono audio and apply a better fix.