Reverted to non-cache-timing attack resistant version