This seems to be added overhead that isn't directly used or necessary, @MonikaFu what do you think? Trying to tidy up some tech debt ahead of release. If you agree, I'm happy to self-assign this one.
