Revert some stuff and add back msm audio