Revert "remove --ivf=safe"

This reverts commit 692a616ab43fc02cc8c033f070783b457f74b458.