That's precisely what #2180 (filed by Chris) asks us to change.