Revoking incomplete bugfix 2e41db16f683998cda7ab97563fdd0e01d7c265a - Better crash than have hard to debug infinite loops