ENYO-700 (2.5)

Cherry-picking changes from https://github.com/enyojs/enyo/pull/983 into `2.5-upkeep`, creating a PR for tracking purposes.

Revert "Merge pull request #978 from enyojs/BHV-19913-anshu099-2.5"

This reverts commit 0b83892bdb1d3513e385288b7fc87c9d956ca984, reversing
changes made to d5102c7b823f687af0fb98db5cac7fb5ebd57891.