Revert "Merge pull request #1006 from kyungmin/update-strapped"

This reverts commit 9ab4fe9875311fe69d6b0f8cbd0b7be9fd7d824a, reversing
changes made to fe6c0c155af788bc6916a64a7fe59970bd6d06cc.
Resolve merge conflict