It seems like it would have been cleaner for this entire file to just import `DefaultConnectionIdentifier` from `util` instead of replacing everything?