Revert "Merge pull request #43 from terasolunaorg/issues/7"

This reverts commit eda48d66c1a17a3526ca9bace5e222c2f888d416, reversing
changes made to 6ab208d084279c6c611c3d24c182400be8e2fa78.