Revert "Add some null safety"

This reverts commit b563d821e56bf43d5e8df10abdc3bf526a9843d3.