Revert "fixed issue #1939"

This reverts commit e794f1a043d392bef6500f4130f64320dcb8fa56.