Ref fd43865c: restore correct logic
Fix version; we are not at 2.0.0 yet!
Fix #13310. Get the right display value for disconnected nodes. Close gh-1156.