Ugly Ugly fix for backward compat. Can we get OPC out before we break OB? kthx