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