Revert "remove --ivf=safe"

This reverts commit ed1b54935d31f3b41d539ab46e10a08ab3c33018.