Revert "core: QCOMs revenge"

This reverts commit 8f0597b2f24ed38ba78c113f1ab5900ec0a82341.