Revert "Merge pull request #1753 from enyojs/BHV-16740-kunmyonchoi"

This reverts commit 6cd76e474b8d9c57a23ab1c63c5cb287dd54cba1, reversing
changes made to c9086a16b40faf11bad79be243e6b223cc80a675.

A full solution will be investigated for ENYO-456 instead.