Revert "Merge pull request #348 from enyojs/ENYO-2402"

This reverts commit 36bfbfdc9e6c7f17b3b05b812add2364120176bf, reversing
changes made to a0e7b2848fc00b6a2d6fcdf88fd63a9ba35bc62f.
Merge branch 'master' of github.com:enyojs/ares-project