Bug 917193: possible Gaia workaround