Backed out changeset b030bb382b31 (bug 1051995) for m-oth bustage