This reverts commit dd4d6d9ed54c2a63a7e45661519d9965417707c5. It breaks ogg muxing and the vorbisenc unit test.