bug 870407: cleanup bug. r=mshal