Revert "WIP: pickle: rm special cases, plugins pickle now"

This reverts commit 0a9b85460c2ad1298449a1eea936a2ca30220ffd.
2 files changed