89d19d60ad
This reverts commit1f3dd83cc1, reapplying commitbb1b0bc4e5. The original commit failed on some builds seemingly due to the use of a bracketed constructor with an std::array, i.e. `std::array<> arr({...})`.
89d19d60ad