revert back to "b4f9874f33" mali: Miscellaneous changes