fix #2434 remove side effect of #1638 for 3.8.x