In SUPPORT-2307 the customer has found out that login with a simplification works but not with the original version.
There is absolutely no reason why the original (complicated) way should not work.
The root cause is some issue with the luna HSM.
But on the other hand the original way do not give anything extra compared to the new so I believe it is a good idea to simplify. Also I think it will be easier to understand the code.