I don't think we need this anymore, this was my workaround for a bug which I have since fixed.