Removed broken serialization again