Revert "Make tests 1995, 2001, & 2005 less likely to OOME." am: 01a09bfd38 am: f113f89b55

Change-Id: I876393abab1199b9aa60896e019215c1dc885e12