CMS-2959 Live Edit - LiveEdit is broken after save/reload