Revert a change for Array that was causing most other tests to fail.