I voted patch 7 because too much time and effort has been wasted in this tiny detail while other parts of the game are still in shambles, Wyll for example, and are much more in need for attention.
So just leave it as it is.