Revert "fix #2037"