Unreviewed, review follow-up after r218961