Backed out changesets bacfdc83424a and 7d12b5d7446f (bug 984048) for crashes.