Add multipart encoding again