Oops, this belongs in another branch. Revert "Making ApiImport mostly compatible with Magento 2."

This reverts commit be074cf8b5e5d2443776108f4e881788777deebb.