500 error when canceling image edit

Steps to reproduce

• Open an Image content item in Integrated

• Click the cancel button

• Error:
  Catchable Fatal Error: Argument 2 passed to Integrated\Bundle\StorageBundle\Form\Upload\StorageIntentUpload::__construct() must be an instance of Symfony\Component\HttpFoundation\File\UploadedFile, null given, called in /home/-integrated/releases/20170131163348/vendor/integrated/image-bundle/Validator/Validator/OnTheFlyFormatConverterValidator.php on line 53 and defined

I'm not sure if it is related to INTEGRATED-998, but the PR in doesn't fix it.