Already applied in msm8960-common :-(