Revert "hoge"

This reverts commit e4bcc18bfc7e8f3739644f41052c8da19ac3add0.
Merge develop into master