Since this commit we see issues after restart - have to look into further This reverts commit 9f8da74cb0.
9f8da74cb0