msm8660-common: partial revert of 5b58914c05b48943be74cb604b4518edef3a9e44

Change-Id: Iccaa94d51522d091f8c8142f5eaec7b4455334d2