Revert "Merge pull request #1 from DevYah/T12_jihan"

This reverts commit 94d38d5ecf8e3c8d29f93293b2988bed45b2591f, reversing
changes made to 1d9b324f5739e4962034e1df76f43e80926f6428.