Revert. The original line might have been long, but this is less readable IMO. It can be resolved later on once we hook in CS validation.