[Matahari] Patch supercedes previous patch...