[ALOY-996] Roll back ALOY-858 changes

Resolves https://jira.appcelerator.org/browse/ALOY-996

The originally-requested functionality to be implemented by https://jira.appcelerator.org/browse/ALOY-997