Back out ba95fffe62b9 and 564283498a6f for Australis (bug 930970), r=jaws,Unfocused