Revert "Merge pull request #620 from igorko/master"

This reverts commit 634472b52d6aa63f9efdf8d8ee119c5fd44373f0, reversing
changes made to 7b3151d48a5e377951f2a46e7bd772623905a467.

Reverting back to clean base