Revert "Merge pull request #1 from Pikuseru/to_merge"

This reverts commit a76b2164c984814c28860498a2d5149cb12d3bba, reversing
changes made to 6fe38af02def62cbf1f0780847ae9a2d81da4e72.