Revert "Merge pull request #1 from MoeLa/master"

This reverts commit 4955d33770f0afc028fbeee07e490cffb5d705e5, reversing
changes made to 610e6a073fc347f93fbc59fa6b31f49f70e22d94.