Revert "Revert this as it caused audio issues on some roms on G2"

This reverts commit 1c0696be641e3eae7508fdf51ba87175a1a5ef77.