Backed out changeset 0f91a3f28a44 (bug 976205) per request - incorrect patch