Looks like there's some leftover code from the multiway fix here.