Revert use of dynamically-sized arrays.