Revert "Revert "Revert "Maintain a null key by doing a substitution"""

This reverts commit fa381dc7c9f2e894adbeb89df9f089b08d3060d6.