Eh, I’m happy just removing the asinine statement to the audience before it happens that it will be temporary.
You’d have to remove 3PO saying R2 is receiving a message from Master Luke. Unless you remove the first part of his line and add a syllable to read, “He (or this fellow or something) says he is receiving a message from a ‘Master Luke’.”
I really like the DOTF idea of having R2, who famously dodged a memory wipe in Ep3, manually recounting their history to him. But with what we have to work with, I don’t want to remove him getting them restored.
RogueLeader is way ahead of you. I’m sure he can pop in and share a clip of what he came up with (that I’m copying).