Fix the mystery of disappearing cutouts
Merge pull request #6431 from guardian/fix-cutouts

Fix the mystery of disappearing cutouts