Revert "Properly move QCOM-specific thing into the #ifdef"

This reverts commit 6b439cd6a6a472a8ac7adb6344020a3dff423283.

This is tied in with more than I thought, will evaluate this again later.