Fix unsetting storage key (Bug #11972).