Fix a regression on reloading the editor content due to
refactoring/update