Revert "Removing redundant image-list code"

This reverts commit c14a30608a4023a98c82f39cd96cd4e9d8f73de6.