Yes, you are right. I'll revert it. BTW, actually half the stuff in this header should not really be exposed, but thats a separate issue.