Revert "Maintain a null key by doing a substitution"

This reverts commit 2b08343f0b750995d2889c6a3a13801b23c34c6a.
Revert "Revert "Maintain a null key by doing a substitution""

This reverts commit 37b9df647b94c01d36c7452f44a63dcceb698449.