(U-00020983): Use `<-original' and `<-original*sources' instead of