Re-land a piece of the patch for: