Backed out changeset 0fae05649fe8 (bug 919635)
Backed out changeset 5b1a56afe153 (bug 919635) for test_sandbox_symbols.py failures