This is also needed in production for upload, no?