Revert "Merge pull request #2 from Moorviper/test"

This reverts commit f3367d5177a8d724d028df05a5d7465e2633b781, reversing
changes made to ae95386043f8bde0f3804f669abb87096c2adf57.