Revert "More safety tuning"

This reverts commit c3163af870ac22df6abfa14438882e310652f94e.