Revert "Change highlight to raw"

This reverts commit ef9984426fe9fc0193c9beade9a40b247525f5c0.