Backport fix for image class dependencies