This is compat code right?

Feel free to bounce this one back to me, but could we separate it to a different class?