Revert "fix #2549"

This reverts commit 430b74e65f5eb9cfc0e07af7ff8ae33d2062ed5d.
fix #2551