Revert "Merge pull request #1 from 1995hnagamin/develop"

This reverts commit 67838a80791fb757d45e9d3bcf638e4119ef89a5, reversing
changes made to f6bfb5538f8a3f91bea0ae56aa3866186303cd20.