Partial revert of broken test changes from r92246 -- for some reason it was trying...