Revert "Merge pull request #504 from enyojs/ENYO-2949"

This reverts commit 510487aa63c8118b04867a6933c290df0dbf2cbc, reversing
changes made to f115ecaea4c2bbf22232ad9e83afba397ec707d9.
Merge pull request #511 from enyojs/ENYO-2949

Revert "Merge pull request #504 from enyojs/ENYO-2949"