Definitely. Let's keep this for a followup bug, though.