I didn't want to tangle this PR up with removing / fixing section editing. That's a different bug entirely.