Revert "Nil Fix Update"

This reverts commit 5d20258267dfb7afb75859976f7e066ed4ef32c2.
Start from NilFix - attempt at devise
Revert 5d20258..0f50413

This rolls back to commit 5d20258267dfb7afb75859976f7e066ed4ef32c2.