gaia: more restfp fixes removed