Bug 787395 hack around for error in onUntrack caused by bug 855484