#931525 dak: NVIU removal should only happen after some time