The original version was the best, there was no good reason to change it and censor it when Minthara's scene exists at the same time.

There are actual things in the scene that need fixing and they still haven't been addressed (again NSFW):

1. Tav's knee - just LOL:

[Linked Image from i.postimg.cc]

2. Dialogue options appearing too early since patch 4:

Patch 3 (3 seconds into this moment):

[Linked Image from i.postimg.cc]

Patch 6:

[Linked Image from i.postimg.cc]