Tentative fix for layout save/restore issue