Proper ungluing layer mapping
removal fix for linter (was actually a full-blown bug)