> It looks like this function is a no-op now, perhaps it can be removed?

Even with this branch?  (Testing a build right now)