[src] reverting matrix implementation until open questions are answered