Revert "Safeguarding"

This reverts commit 4e3e84a340c724765e50b11b756802e08c000534.