In JMC-6833 we'll need to find a better way to handle image descriptors. For now though, we have a serious issue in the application. We'll fix that one eventually, but for now we need to roll back some of the changes.