Backed out changeset 662f6427c909 (bug 872890) for debug bustage.
Merge m-c to birch.