I'm guessing this should disappear? But that's in the other pull request, from what I recall...