It's the weirdest thing... this shows up in this PR, but this isn't in the branch-0.8 branch.