I made this change because the Image type is not something that really
belongs in the backend.
Had to modify these files to fix the build after the previous edit.
Moving closer to the point where there is something that people could
actually look at.