Revert "mali: squash of many commits"

This reverts commit 91f4648584c72fb6c4dd2c47bb9958a71de93ce7.