Revert "Merge pull request #1396 from takethathe/update"

The PR #1396 broke the build on Tizen.

This reverts commit 3fa5458b998020a1bf7fff34ee61b85f10ccf4ca, reversing
changes made to b1f193724ec58b419ae6596d9e629c3544034edd.