BUG: array raveled but not reshaped in all cases
 - [x] closes #16362
 - [ ] tests added / passed
 - [ ] passes ``git diff upstream/master --name-only -- '*.py' | flake8 --diff``
 - [ ] whatsnew entry
