Unreviewed, try to fix the Sierra build again after r226277.