I mean it's just not good to have a hack in there. If it were minimally intrusive, it wouldn't be a big deal, but this is a function used in many places. If the hack somehow changes the behavior of other code, someone will depend on it and if we change it back, other tests will fail, or maybe someone isn't entirely satisfied with the hack, and writes another hack on top of it. All this will probably not happen in this case, but still... why not wait for Petro?