[Australis] Backout cbe26a93c79b (bug 930094) for test failures.