I think we an get rid of this and drop support for <0.8