Unreviewed, try to fix the Sierra build after r226277.