Backed out changeset 0ae1b3474b22 (bug 982726)
Backed out changeset 26cd857611b8 (bug 982726)
Backed out changeset 062c0a4db943 (bug 982726) for m4 test failures