[Australis] Backed out changeset 0592b1488a8a (bug 940286) due to regressions.