Reverted the serializer