Follow-up patch for r189343.