Automatic merge from submit-queue (batch tested with PRs 40289, 40877, 40879, 39972, 40942) Remove the temporary fix for pre-1.0 mirror pods The fix was introduced to fix #15960 for pre-1.0 pods. It should be safe to remove this fix now.