Unreviewed, follow-up patch after r230474