Backed out changeset 8233d40249e0 (bug 891882) since it needs to fix/disable gaia tests before landing