Backed out changeset b17f6c6b10a1 (bug 1114981)