Oops, this is left over from when I was trying to solve the problem found in b818515. I'll drop another commit to put it back how it was.