[Mosaic] Revert "tweak patch so configure find libXpm"