Revert "Merge pull request #1827 from enyojs/ENYO-592-krishnarangarajan"

This reverts commit 62c491bb0c6f8a263a61c899c74760c0e887b588, reversing
changes made to d372a7dfaf26cc0b9b4592c434c730e346bd2da7.