Backed out Australis changeset 2bff84532177 (bug 948213) for being utterly broken