CM-172: enough with the potentially painful imgapi 007 migration