Revert "Changes for Image"

This reverts commit a11ca39757c5e2a4240d0576301564af589af542.