Another hacky try at this long-branch bug.