gmp: re-add (hopefully) fixed bottles.