Revert "fix #6480"

This reverts commit 2f0160915ae480aad13cb0ce29b1e819dbeb29a8.