Rolling back the broken highlight/select spike.