I'm going to revert GEODE-2012 because these tests seem to be intermittently running out of memory. Unfortunately I'm not comfortable leaving the bug fix in without any tests confirming the bug and fix, so the entire commit will be reverted. Thanks, Kirk