Revert "Refactored some of the code to be safer"

This reverts commit 1dfed2aa5778c83c9708f0e16ca50e5e3c2cc756.
Bump version