revert to a backwards compatible uid handling