This reverts commit 88d3223ac0, reversing changes made to f8c20fcbe1. Apparently this breaks assumptions about matrix: https://git.clan.lol/clan/clan-core/pulls/1906#issuecomment-13184
88d3223ac0
f8c20fcbe1