Make the identifier match faster (revert to orig)