Backed out changeset 189a0e19896f (bug 1001348) for breaking the Gaia interface