Revert "qcom additions"

This reverts commit a992336e022367c2a79662580a829c4f9c5ffcc1.