Backout changeset aa20a6097d0b (bug 830983) for causing mochitest-other orange in test_app_cleardata_permissions.html.