Backed out changesets a7ea2d51414d and 901717199390 (bug 957917) for causing bug 980375.
Merge m-c to b2g-inbound.