Revert #2044 - Make Array a templated struct, and merge with ArrayBase.