core: better place for delay un-registering hack