Rolled the change to this test back for now.