Issue #2369153: move around image process code so doesn't error out when remote server overrides local images