Revert "Merge pull request #35 from Mr-Runtime/master"

This reverts commit d9d4263f5247c6bd5b40a46e60680c30f924fc44, reversing
changes made to 88ccc6cc3378aea989b0564685ed8689138e1e65.