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