Let's address this in a new bug.