Backed out changeset cfdcf950e403 (bug 105871) for wrong bug number in commit