Backout c0213576a3b7 and 780d65e3ebfa (bug 874984) because it was slowing down HTML rendering
Merge inbound to m-c.
Merge m-c to inbound.