Backout 4ededc9b11f (bug 897433) for intermittent dromeao crashes
Merge m-c to inbound on a CLOSED TREE