Revert "fix #4307"

This reverts commit 6302277de296e574db815c2efbbe15e26493f845.