derr. missed that change in the rebase. This was one of those simple changes that is already totally deprecated by the time it's committed :/