Go back to using MP2 audio in 3.6.x