Unreviewed gardening after r114766.