Backed out changeset aad5b9304896 (bug 951453) for Gaia UI test perma-fail.