Keep original source/target paths in returned result

I made a mistake updating result paths in #1531 this fixes it.