Revert "Fixed #1412"

This reverts commit 1e47160cc136d6c36575c289df3ce5fb1d423121.