oops: Don't unlink before delete
merge: Upstream
oops: Correct pointer to value_pop_and_del