Revert to original behavior for makeArray (moved to its own pull request)

Separated out the changes to makeArray into #1235