Backed out changesets f2387d9f146c and d12788533ab7 (bug 860145) for causing topcrashers.
Merge m-c to inbound.