[Australis] Backed out changeset 3d0775f7bd0f (bug 897496) for the same error it caused last time.