Revert "Merge pull request #1379 from lwyszomi/master"

This reverts commit ebe777c816195d0f956b5d651a1512f6ad286747, reversing
changes made to bd2fb7e137b0a571ab28fc97ef07807b70a7d23e.