Ooops, I fixed this in the *big* pull request, and forgot to split that part out. Fix incoming.