Backout Australis changes. rs=Gijs
Bug 969782 - Uplift hotfix from bug 695143. r=gozala, a=lsblakk