Revert "Merge pull request #1 from iori-o/aaa"

This reverts commit 3a39039a4d2bb28d206adc58b2a6ed876ce4d4b5, reversing
changes made to b43e25ed42900e6ef1234924bfe542b08f25b12e.