Unreviewed follow-up to r277376.