Backed out 2 changesets (bug 1038997, bug 1039881) for apparently causing tart crashes.

Backed out changeset 7da62c51fa97 (bug 1039881)
Backed out changeset 238174823b7c (bug 1038997)