diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 09c7f4aa79a..2e321341b01 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -3487,7 +3487,7 @@ void EditorManager::setLastEditLocation(const IEditor* editor)
     location.document = document;
     location.filePath = document->filePath();
     location.id = document->id();
-    location.state = QVariant(state);
+    location.state = state;
 
     d->m_globalLastEditLocation = location;
 }
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index defe03271de..3ac8405ea26 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -241,7 +241,7 @@ void EditorView::updateEditorHistory(IEditor *editor, QList<EditLocation> &histo
     location.document = document;
     location.filePath = document->filePath();
     location.id = document->id();
-    location.state = QVariant(state);
+    location.state = state;
 
     for (int i = 0; i < history.size(); ++i) {
         const EditLocation &item = history.at(i);
@@ -472,7 +472,7 @@ void EditorView::addCurrentPositionToNavigationHistory(const QByteArray &saveSta
     location.document = document;
     location.filePath = document->filePath();
     location.id = document->id();
-    location.state = QVariant(state);
+    location.state = state;
     m_currentNavigationHistoryPosition = qMin(m_currentNavigationHistoryPosition, m_navigationHistory.size()); // paranoia
     m_navigationHistory.insert(m_currentNavigationHistoryPosition, location);
     ++m_currentNavigationHistoryPosition;
@@ -527,7 +527,7 @@ void EditorView::updateCurrentPositionInNavigationHistory()
     location->document = document;
     location->filePath = document->filePath();
     location->id = document->id();
-    location->state = QVariant(editor->saveState());
+    location->state = editor->saveState();
 }
 
 static bool fileNameWasRemoved(const FilePath &filePath)
@@ -558,7 +558,7 @@ void EditorView::goBackInNavigationHistory()
                 continue;
             }
         }
-        editor->restoreState(location.state.toByteArray());
+        editor->restoreState(location.state);
         break;
     }
     updateNavigatorActions();
@@ -589,7 +589,7 @@ void EditorView::goForwardInNavigationHistory()
                 continue;
             }
         }
-        editor->restoreState(location.state.toByteArray());
+        editor->restoreState(location.state);
         break;
     }
     if (m_currentNavigationHistoryPosition >= m_navigationHistory.size())
@@ -615,7 +615,7 @@ void EditorView::goToEditLocation(const EditLocation &location)
     }
 
     if (editor) {
-        editor->restoreState(location.state.toByteArray());
+        editor->restoreState(location.state);
     }
 }
 
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index 03424a93f2d..20cf782bc14 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -43,7 +43,7 @@ struct EditLocation {
     QPointer<IDocument> document;
     Utils::FilePath filePath;
     Utils::Id id;
-    QVariant state;
+    QByteArray state;
 };
 
 class SplitterOrView;