Backout of 82d2161

... for mp3audio regressions