Revert "merge in highlight"

This reverts commit 5ede2e1773c31618fc96c61a524a6357d84ffcb0.