Revert "Merge pull request #877 from enyojs/BHV-15490-ryanjduffy"

This reverts commit 96c6cdb462b908546659f313972f71e306c939e2, reversing
changes made to f146196db601a33ecff0588cf612933d26fdbd28.

Reverting this in favor of the fix for BHV-16550 (https://github.com/enyojs/enyo/pull/913).