Revert all remove image proxy changes

This check in reverts all image proxy changes
Unfortunately this also means one or two changes they may have been to
fix none related bugs, I think the main one was for the log fix for
unicode.