Backed out changeset 72a979eba564 (bug 857330) for crashes.
CLOSED TREE