Revert client array packing changes.
Revert more changes to get back to passing tests.
Remove now-invalid tests.