Revert "Merge branch 'image-class'"

This reverts commit 6c72905c513f236a05093579116904405fd3d33d, reversing
changes made to 005e591d805fd3c4e49cb1c098eec28c93106c67.