Shouldn't this be private? It doesn't feel like being part of the interface. (I know it was public in the previous implementation, but thinking about it...)