Backed out changeset 8304d89d4300 (bug 997584) since should wait for gaia blocker landed first.
Backed out changeset d050c422919a (bug 997584) since should wait for gaia blocker landed first.