Unreviewed gardening, rebaselining after r155253.