Not sure we want this, I just had this hanging around for a long time.
I guess if we merge it, we could backport it.