This is inappropriate to submit during the merge window as net-next is closed and only bug fixes should be submitted at this time.
Your submission was perfect initially, just adding the necessary symbol export to fix the ucc_geth build when modular. Please don't tinker and add cleanups for a bug fix like this. Thank you.