Revert "Major Change for Images"

This reverts commit 72bc93291776c89171568870be04278f3fbb35c2.