[gaia] Try to handle the Gaia plurals screwup

See the comments. Tests needed, though not yet sure how to properly test
this.