Comment out some tests that won't pass now that we've reverted the

picklability regression.  Also, as per further discussion, remove the
regressing code.