Fix for bug 844225 (Remove some DOMCI and quickstubs). r=bz.