Oh, and, if the code literally asserts they're the same function, that's just a sanity check based on the implementation.  You could preserve that if you care to, or you could just write a new function and remove the assertion.  Do what you think is best, then post your patch to the tracker and we'll all argue about it forever, how's that sound?