Revert "base: QCOM's revenge"

This reverts commit 5e732509ca71dbfd386800dabbabf32d196fa71a.