I have been testing without this code for quite a while now, and I never
got the crash responsible for this hack anymore. So, lets remove the
hack, and if the crash occurs again, we should find a proper way to
fix it.