Revert^2 "Make tests 1995, 2001, & 2005 less likely to OOME." am: 93be70effb am: 068c2b351a

Change-Id: I515bec1accd14b197f9960b2411fa54430f8bf56