U_ missing here? and as we change the next link, we could also just drop this backwards compatibility step