This is horrible, but Justin is fixing it in a followup bug, I think.