Revert "[WIP] [name] Port to fancy serializer machinery" This reverts commit c7f366fbbb208d0a9103ac4ee4ac00ff726c31e4. Don't know how it got to master!