This reverts commit 1b3677b3. StorageManager uses null as a legal value. Requires more extensive refactoring.