follow-up to r106912, making change to correct branch this time