Revert "Revert all remove image proxy changes"

This reverts commit fdcd2e2bb69750812b921b6c1f14327caeef7ed2.