Resolves: fdo#87199 deregister during destroy as lower of upper

Change-Id: I7e52bba78a0fbe32814510b44ad049d3504e7164