In preparation for #279