Backed out Australis changeset 5e2752c9cf2b (bug 941211) which totally shouldn't have made it into the tree, rs=stupid-me