Will say it once again: we should really, really switch all that duplicating code to proper use of new ID management API :(