Backed out changeset 3697a043583b (bug 982118) for bustage.
CLOSED TREE