Yeah, let's keep them separated. I'd open up a bug after check-in this.