Revert "Image plugin commit"

This reverts commit 7873933616eed7491d9e412b0f2d71aedc919a4d.