Reverting force_upload change