Revert "Merge pull request #978 from enyojs/BHV-19913-anshu099-2.5"

This reverts commit 0b83892bdb1d3513e385288b7fc87c9d956ca984, reversing
changes made to d5102c7b823f687af0fb98db5cac7fb5ebd57891.
Merge pull request #984 from enyojs/ENYO-700-aarontam-2.5

ENYO-700 (2.5)

Integrated-By: Aaron Tam (aaron.tam@lge.com)