Revert "Fixed #2219"

This reverts commit 98a3cba8448ca870db20da769f78116da558182b.