Changes to highlight behavior -- to revert
Revert "Changes to highlight behavior -- to revert"

This reverts commit 9f978876510709a8aed3203180f23f156313cf1d.