ENYO-700 (2.5)

Cherry-picking changes from https://github.com/enyojs/spotlight/pull/162 into `2.5-upkeep`, creating a PR for tracking purposes.

Revert "Merge pull request #161 from enyojs/BHV-19913-anshu099-2.5"

This reverts commit 628f726ab363ce3b652eac82420ed970c3b804f2, reversing
changes made to 7b1f5a796e6e456a7193ad56d91419e7d3675704.