Bug 931891 - [Australis] Backed out bug 887515 and the followups (bug 896291, 909662, 896896). r=ttaubert

--HG--
extra : rebase_source : f6568e83e23c036f21270e0f133ee06b192b1f9e