Revert "Merge branch 'highlight'"

This reverts commit bff68a5fcf728e47d9862d25ac643f3ce5f3df3d, reversing
changes made to f3e791dea9663347e898456942a20ba6116de41f.