Merge branch 'MAGETWO-51403' of https://github.corp.magento.com/magento-tango/magento2ce into MAGETWO-51470

Author: shiftedreality

app/code/Magento/Catalog/Setup/UpgradeData.php

@@ -257,6 +257,12 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                 'frontend_label',
                 'Small'
             );
+            $categorySetup->updateAttribute(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                'image',
+                'frontend_input_renderer',
+                null
+            );
 
             //Design tab
             $categorySetup->updateAttribute(