Update and revert cse style definition.

From #6501.