Unreviewed, follow up patch for r201964