Backed out changeset b2ef6a444640 (bug 1046554) since the gaia part has been reverted