Fixes #5161
Merge pull request #5451 from tkdrg/yayfabricatorbugs

Fixes fabricator stack removal