Backout ca927541e644:885c09371fe5 (bug 888685), because green builds are more Christmas-y than red builds