Backed out changeset 4110a8986a2a (Bug 912371) due to Bug 940246 and Bug 940324