Bug 1005035 - Backed out changeset 5178a30216fe. Reenabled the changes on default