Actually, see #442. I'll make this change once that lands.