Revert "Try to make stuff less Unsafe"

This reverts commit e1eb4558f13a4db342f588f321b8c13bc33cfac0.