Go back to using newline-and-indent for now