split-forms changes this in a way that's not susceptible to this particular bug.