Revert "Try to fix some panics"

This reverts commit bd8a833b7c7a2e6ebc3f1370ae13ce1ef8d83759.