Revert "Update 1.8 branch for fix #1565"

This reverts commit da79093818cbbcdddbfe221127a7c2678cb1d3cc.
Revert "Update 1.8 branch for fix #1565"

This reverts commit f2a1e7a6f1c50d90dcacbae64ba8d6adb7997c1f.