Restore some code style breaks