[TIMOB-17601] revert #6137 (3_4_X)

Backs out changes made for https://jira.appcelerator.org/browse/TIMOB-17601