Backed out changeset 9e93a0ac18a0 (bug 993904) for depending on 94eef72cb9b7, which I'm about to back out for bustage
Backed out changeset 94eef72cb9b7 (bug 993901) for causing OSX bc1 to frequently fail in browser_tabopen_reflows.js
Merge m-c to b2g-inbound