Backed out changeset 4eb7a0f560da (bug 867143)
Backed out changeset 101c149b3287 (bug 867143) for browser-chrome failures