@peterflynn 

>  I don't think we should change this one API...

I wasn't suggesting that API should be changed, just not used here.