Revert "Merge pull request #23 from naoiwata/PR/1.3.2"

This reverts commit 3fd9fef9c9e4a8ed3ac40a64424d7873b4bfbda1, reversing
changes made to f7ad0847bcf7c90f11edbe3c4bdb649f2cf6e3c9.