r184718 and r184725 caused four tests to begin crashing