Barlines extend to staff below

I'm setting a choral score, with six staves (although no more than four are visible in any one system.) I was playing around with the barlines (probably experimenting with "mensurstrich"), and now they all extend to the staves below. I can edit them by "selecting all," and then unchecking "span to next staff," but that will also affect the lines at the beginning of the systems. Is there a way I can set the barline properties to the defaults? I've done a lot of work adjusting the page layout, and I don't want to mess that all up.

If worse comes to worse, the score is short enough I could adjust each of the offending barline individually.

I'm also attaching a score with the barline layout I'd prefer.

Thanx--
--WF