Revert "removing the 'safe true'"

This reverts commit cf893e23939edfa4db2bc0e416aa7e372d108f86.