1240c6f6 does not prevent the crash it is was supposed to fix. This reverts commit 1240c6f6. CCBUG: 283241