Revert "av: QCOM's revenge"

This reverts commit 357c018be52386dac09a0fa8217148d5f0930998.

I screwed up and merged this too quickly I think.

Revert it until we can properly test/fix it.

Change-Id: I44871e0293eda9bca21728caa3c3da09f2331ba8