Revert "Goonstyle fabricators, take 2"
Merge pull request #1282 from d3athrow/revert-1257-butt

Revert "Goonstyle fabricators, take 2" (community vote)