Backed out changeset 70946e64e8f8 (bug 1005704) because it caused bug 1006541