Fix restoring fully matched sandbox layers