We don't need this function at all anymore, do we?