This was causing a crash in opt+assert builds on linux and a follow-up message was posted. This reverts commit e81268d0