Merge pull request #24 from mbullington/revert-nullsafe

Revert null-safe change.