Revert line from #4585 to get mask, data shapes to match in .flat
Merge pull request #4615 from mhvk/ma/matrix-flat-redo-shape

Revert line from #4585 to get mask, data shapes to match in .flat