timob-15535: Revert timob-14615

Testing steps in JIRA: https://jira.appcelerator.org/browse/TIMOB-15535