Revert "Fixed odd dereference that caused segmentation faults"

This reverts commit 114088fac010c2c6ef21d650fc8d30beb10c5739.
I can no longer reproduce the problem.