Unreviewed, rebaseline tests after r236632.