Revert "more stuff converted to std::array"
Revert "more stuff converted to std::array"

This reverts commit 2b184a9b1a7938e781f289a400a2f76603b36fd7.

anton-povarov/pinba2,anton-povarov/pinba2,anton-povarov/pinba2,anton-povarov/pinba2