Back out 2b332be3b73f (bug 1105574) for crashes
CLOSED TREE