ATMachine said:
So – although the idea was likely abandoned during the production of ESB, and then hastily resurrected for ROTJ
I would assume it was cut out earlier than that, considering the good luck kisses Leia gives Luke in The Death Star and before he Departs to his X-wing.
I haven’t seen enough of the Mayhew Script to confirm if it was in there since they started shooting or if it got added in later on during filming.