Backed out changesets 248e0f88fa0a and 41995e096743 (bug 1033952) for B2G debug asserts/crashes.