Revert Experiment #5.1 until qcom_display changes