Revert "Address the comments of the merged image handler patch"

This file was added in a55bbbfa1957d02b3006a51afcf4984a1f8ff886 and
later fixed up in 9e8513e6fe4bf8a8759ad0c1d71594f952d920ad. Only the
first commit was reverted in 0ba9cca788309bd8763a0d277a907769604cd9f4,
this commit finishes the job and reverts the fix-up commit so that the
orphan imagehandler code doesn't linger and doesn't get in the way of
future changes.

This reverts commit 9e8513e6fe4bf8a8759ad0c1d71594f952d920ad.

Change-Id: I3cf8000a3e984c57441a226d3139acbf3e346825
Merge "Revert "Address the comments of the merged image handler patch""