Bug 1025849 - Backed out changeset b3efef6759d9