Unreviewed follow-up to r216776.