Merge "Revert "Ensure void type is resolved when running without image""