Oh, she totally did. But that doesn't mean she was totally okay with it. She went out west for a long time after that. Until this run started, and they were suddenly all OTP.

It fits in with older canon a little better, but he's certainly not staying consistent with himself.