Revert "Updates for msm8960"

This reverts commit 3dc6d0ee110025e4b3e34738ba37cfc6a5d0676d.