Bug 1033402 Gaia-Try. DO NOT MERGE