Revert "base: QCOM's revenge"

This reverts commit 78d8b30d1c1c6a117be12048e1966a5e2ac43655.