Revert "Unsetting non-existant key does not throw notice/error, so unset without checking"

This reverts commit 532b3e771755fda3909fc46a02211dfc3317730d.