Rolled back change to panic