timob-16840: revert fix for timob-16358

Signed-off-by: Hieu Pham <hpham@appcelerator.com>
Merge pull request #5593 from hieupham007/timob-16840-3_2_X

timob-16840: revert fix for timob-16358