NXP-14072: improve concurrent update detection on removal