removed the hack and left only the vanilla leaf fix