Re-add workbench moderation patches