Don't pull this yet, just previewing changes for #1606