Revert "Merge pull request #877 from alexeyklimenok/master"

This reverts commit a3cabba18b23d6f7dd409f18629033e7d8c58afb, reversing
changes made to 332eb9e2d2f213069afb3e085a392170047561be.