Move one patch to already_works_on_mangos