Reverting match highlight colors.

This is a fix for #8800.