Pull from original serializer that should fix test errors