Unreviewed, follow-up after r288066