cause compilation errors when we update headers. This is a temporary fix that will be removed at a later date. OK naddy@