Revert changes compatible only with Qcom boards