That's actually what I ended up doing to 'fix' it. It's disappointing, yet not surprising, to learn it's intentional subversion of the API.