Sure. I'm open to discussion on this on another point: whether we should be doing this hack in this bug or whether we should have a new bug dedicated to this.